From 8e552c41447d5ea428f5af330b17ca24349e208b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 10 Jul 2006 16:51:52 +0000 Subject: [PATCH] Fix some memory handling issues. (#347043, Chris Wilson) 2006-07-10 Matthias Clasen * gtk/gtkfilechooserbutton.c: Fix some memory handling issues. (#347043, Chris Wilson) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtkfilechooserbutton.c | 7 +++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2aaced8cb3..b74fdc6823 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-07-10 Matthias Clasen + + * gtk/gtkfilechooserbutton.c: Fix some memory handling + issues. (#347043, Chris Wilson) + 2006-07-10 Emmanuele Bassi * gtk/gtkrecentchooserdefault.c (scan_for_uri_cb): Do not diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2aaced8cb3..b74fdc6823 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-07-10 Matthias Clasen + + * gtk/gtkfilechooserbutton.c: Fix some memory handling + issues. (#347043, Chris Wilson) + 2006-07-10 Emmanuele Bassi * gtk/gtkrecentchooserdefault.c (scan_for_uri_cb): Do not diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index 38e1ab8bf5..ad57571f8b 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -460,7 +460,7 @@ gtk_file_chooser_button_init (GtkFileChooserButton *button) G_TYPE_CHAR, /* Row Type */ G_TYPE_POINTER /* Volume || Path */, G_TYPE_BOOLEAN /* Is Folder? */, - G_TYPE_OBJECT /* handle */)); + G_TYPE_POINTER /* handle */)); priv->combo_box = gtk_combo_box_new (); priv->combo_box_changed_id = @@ -894,9 +894,7 @@ gtk_file_chooser_button_destroy (GtkObject *object) priv->dialog = NULL; } - gtk_tree_model_get_iter_first (priv->model, &iter); - - do + if (priv->model && gtk_tree_model_get_iter_first (priv->model, &iter)) do { model_free_row_data (button, &iter); } @@ -1604,6 +1602,7 @@ model_add_special_get_info_cb (GtkFileSystemHandle *handle, -1); out: + g_object_unref (data->button); gtk_tree_row_reference_free (data->row_ref); g_free (data); -- 2.30.2